merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 12 Dec 2011 04:04:19 +0000 (13:04 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 12 Dec 2011 04:04:19 +0000 (13:04 +0900)
commitd679f729396a43f2be2267d5bda3a86cf644fec0
tree325cd13b681905b559ec20304e68624af8aba47e
parentcb8a6a749f554cb049bea34337bcc09a5253f0e6
parentb12f5a2e875c2ee25ebe997136e4910a89304260
merge trunk